shell-tray: Ensure that only a child can be added

Origin: https://gitlab.gnome.org/3v1n0/gnome-shell/-/commits/tray-offscreen-xwindows
Bug-Ubuntu: https://bugs.launchpad.net/bugs/2012388

Gbp-Pq: Topic tray-icons
Gbp-Pq: Name shell-tray-Ensure-that-only-a-child-can-be-added.patch

diff --git a/src/shell-tray-icon.c b/src/shell-tray-icon.c
index d4c5552c3da751825df143ac21dce108eab3d29b..ec799d2fc3b1eb2f3c6e0930f97effd2f1c8c60d 100644 (file)
--- a/src/shell-tray-icon.c
+++ b/src/shell-tray-icon.c
@@ -239,6 +239,7 @@ shell_tray_icon_set_child (ShellTrayIcon *tray_icon,
   MetaDisplay *display = shell_global_get_display (shell_global_get ());
 
   g_return_if_fail (tray_icon != NULL);
+  g_return_if_fail (tray_icon->tray_child == NULL);
   g_return_if_fail (tray_child != NULL);
 
   /* We do all this now rather than computing it on the fly later,